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

Change-Id: I60fff87b0d2894126c34bb3fbe32bbb2e6f71225