[automerger skipped] [automerger] DO NOT MERGE Fix unexpected behavior in...

[automerger skipped] [automerger] DO NOT MERGE Fix unexpected behavior in Bluetooth pairing am: ac6c49d2 am: 5b98c9f4 am: dfe4cc74 skipped: d276b386 am: 5d27bdb6 am: bab8dca6 am: 84061c71 am: 41be2554 skipped: 74ff24d1 am: c4127072 am: 1b7566cd am: af077f8d  -s ours
am: 33697672

Change-Id: I9636196aa422a8a31148a3ed5684d567967a9891