[automerger] DO NOT MERGE Fix unexpected behavior in Bluetooth pairing am: 4f58c19afa am: e25ebddfdc am: ee220e0238

Change-Id: I3fdb63225079954bace095dc0ddfd78deb372ff8