Merge "Refactor methods to access/modify BluetoothDevice alias and name"
am: 67bef6ab92

Change-Id: Id0a50d482a7ff33df5fcd990a3ce5273956fcc5c