[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: c1d41294 -s ours am: 812cf3fc -s ours am: 68056757 -s ours am: 17c8c7bc -s ours am: 9ee1cba0 -s ours
am: 2ff018d3 -s ours
am skip reason: subject contains skip directive

Change-Id: I0863507caaeac72fdd6c6476addeef3fccf7603f