Merge "Makes BluetoothDevice#setAlias a public API" into sc-dev