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