[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
Change-Id: I527b0743bd4b85ddaa7c2bff32523c1876cb8859
This commit is contained in: