[automerger] DO NOT MERGE Fix for Bluetooth connection being dropped after HCI...
[automerger] DO NOT MERGE Fix for Bluetooth connection being dropped after HCI Read Encryption Key Size am: c5aa5fee am: 0a76ef02 am: 20649305
Change-Id: Idcdaee2b8091c775df14722a28b56589957833f2