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