Merge "Bluetooth: Dismiss pairing dialog on user click" into oc-dev am: fdd8d3f6ae
am: a16bcf17d4

Change-Id: I7e8341383751e04f12f163bbe56eb90376ef491b