Merge "[automerger skipped] DO NOT MERGE Fix for Bluetooth connection being...

Merge "[automerger skipped] DO NOT MERGE Fix for Bluetooth connection being dropped after HCI Read Encryption Key Size am: 0cf7f2c9 -s ours am: c1d41294 -s ours am: 812cf3fc -s ours am: 68056757 -s ours am: 17c8c7bc -s ours am: 961fd5a7 -s ours am skip reason: change_id Iab0fd9f357d18a6b048b971d0393fbb47fd4d793 with SHA1 41c9f044 is in history" into qt-r1-dev-plus-aosp