Merge "Enforce BLUETOOTH_PRIVILEGED permission in AdapterService#setScanMode" am: 948ed62925 am: f2161d6997 am: ced2f4c86e

Change-Id: Ic09bc5870f99465fd2c710cd624b9dbbd4fb92b4