Bluetooth: Prevent race condition when authorizing

Change-Id: Ic875fd619afea5fd36ce9b2f71a91d2d68dbb578
Merge branch 'cm' into HEAD