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

Change-Id: I96a1cffd308983a131ad00c2ba1da050a32900d1