DO NOT MERGE ANYWHERE Allow the Bluetooth MAC address to be updated asynchronously (1/3)
am: 2c69464716  -s ours

Change-Id: Ic618f6ccae7a508c9332b2201debee2dbbf19be9