[automerger skipped] Merge "DO NOT MERGE Atoms: Add BluetoothClassicPairingEvent" into pi-dev
am: 0c9ce0913c -s ours
am skip reason: SHA1 0c9ce0913c skipped by user siyuanh

Change-Id: I39d8af52f6e3c7614f4a024689c7c4ee0a16997d