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

Change-Id: Ib4300ef0b3804c81047b6d642093bc23b2b66935