[automerger] DO NOT MERGE Fix unexpected behavior in Bluetooth pairing am:...
[automerger] DO NOT MERGE Fix unexpected behavior in Bluetooth pairing am: 4f58c19a am: e25ebddf am: ee220e02 am: 7b2b84c6
Change-Id: I23c3c75844ff136521f67f94d4d911a44571ae07