[automerger skipped] Merge "Apply BLUETOOTH_ADMIN permission for...

[automerger skipped] Merge "Apply BLUETOOTH_ADMIN permission for BluetoothDeviceDetailActivity" into rvc-dev am: 21ac98e2 am: c36fe51f -s ours am: 6cb1c40a -s ours am: aee23dc6 -s ours

am skip reason: Change-Id Icbc5879301fec9a7deacd7ee2896fd41b6feab7a with SHA-1 1633ae37 is in history

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

Change-Id: I5f946645a47b70b4f664a6609e759c15fd7ba671