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