[automerger] DO NOT MERGE Fix unexpected behavior in Bluetooth pairing am: ac6c49d2b0
am: 5b98c9f4a3
am: dfe4cc74f7
skipped: d276b38666
am: 5d27bdb6d2
Change-Id: I501c5e16642ce2bddb0c5c5e2ed6e0b84fc34029
This commit is contained in: