Merge "Merge "BluetoothSecurity: Add BLUETOOTH_PRIVILEGED permission for pairing dialog" into qt-dev am: 2642a3c73e
am: 81a3e690c1
am: 94768f3b18
am: f40e2700d3
am: 6e2eefe2c5
am: 7e02378a43
am: 3667dd4e0b" into sc-v2-dev-plus-aosp am: 0030a44068
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15994985 Change-Id: I6858b912e153d7e71e75cb0e4d71a9b214a0ff60
This commit is contained in: