Merge "Allow the Bluetooth MAC address to be updated asynchronously (2/3)" am: c5680c9b05 am: 16609dfe18
am: 559f49a4a8

Change-Id: I6fa8f334a84132e121db7c517ea50ff8d8047611