Merge "Revert value of BluetoothDevice.ACTION_ALIAS_CHANGED back to...
Merge "Revert value of BluetoothDevice.ACTION_ALIAS_CHANGED back to android.bluetooth.device.action.ALIAS_CHANGED from android.bluetooth.action.ALIAS_CHANGED" am: 2d616e08 am: ea358dd7
Change-Id: I8165acfbaea36385fc2c908b145d294d025eb704