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