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

Change-Id: I587f4c0d9aea8114ff4a71259001b399447b40c0