Merge "Enforce BLUETOOTH_PRIVILEGED permission in AdapterService#setRemoteAlias" am: e0bd6d2529 am: 74e7bda673

Change-Id: I974427c63a166fb63d378b29a3fa3483c8a6be97