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

Change-Id: Ie5d30226ef700f29af206416b8392fd9f6017784