[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: 4b9fcd99 -s ours
am: 1c0d7f03 -s ours
am skip reason: subject contains skip directive
Change-Id: Icfbb46e23894cdf4baf3ded483a169ab5ea225ff