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

[automerger skipped] Merge "Removes app access to BluetoothAdapter#setDiscoverableTimeout by requiring BLUETOOTH_PRIVILEGED permission." into rvc-dev am: caa68f08 am: b14c6412 -s ours am: be0bb74c -s ours am: d9093efa -s ours

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

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



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