[automerger skipped] [automerger] DO NOT MERGE Fix unexpected behavior in Bluetooth pairing am: ac6c49d2b0
am: 5b98c9f4a3
am: dfe4cc74f7
skipped: d276b38666
am: 5d27bdb6d2
am: bab8dca667
am: 84061c71d1
am: 41be25548e
skipped: 74ff24d1c6
am: c4127072f4
am: 1b7566cd07
am: af077f8d4c
-s ours
am: 3369767245
Change-Id: I9636196aa422a8a31148a3ed5684d567967a9891
This commit is contained in: