[automerger skipped] Merge "Removes app access to...

[automerger skipped] Merge "Removes app access to BluetoothAdapter#setDiscoverableTimeout by requiring BLUETOOTH_PRIVILEGED permission." into qt-dev am: db3923e3 am: 46894f70 -s ours am: 7d6de2c8 -s ours am: 234a98b8 -s ours am: 43e794fc -s ours am: 1fae4b58 -s ours

am skip reason: Merged-In I73288f495d35280a5724d070248db54e2fe537fd with SHA-1 f9ac0a09 is already in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Bluetooth/+/17625394



Change-Id: I84dabeebe1f93115ffffc07608c06aac75361a89
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>