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

Change-Id: I648a9c80417dc2249ddbd68007b805b02a774f99