Merge "Enforce BLUETOOTH_PRIVILEGED permission in AdapterService#setRemoteAlias" am: 9b9379474a am: 367c68bc6f am: 1e4c0d7726

Change-Id: Ib4300ef0b3804c81047b6d642093bc23b2b66935
tree: d4b90f0702aca3a61966d1592aa3274c18218be3
  1. android/