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

Change-Id: Ie1252fcba3d6ddc9d4a8dc6962b92114b363aabe