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: 6606caae -s ours
am skip reason: subject contains skip directive

Change-Id: Ie73b1d185aecb3ef1ef90d897074d57110e4ee77