[automerger skipped] DO NOT MERGE Fix for Bluetooth connection being dropped...
[automerger skipped] DO NOT MERGE Fix for Bluetooth connection being dropped after HCI Read Encryption Key Size
am: 0cf7f2c9 -s ours
am skip reason: SHA1 0cf7f2c9 skipped by user jpawlowski
Change-Id: If029a012222cb9a45a593282524518f30f9f0dc6