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

[automerger skipped] Merge "Apply BLUETOOTH_ADMIN permission for BluetoothDeviceDetailActivity" into rvc-dev am: 21ac98e2 am: 2cdf49c4 am: c6f7e0d4 -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: I44396a23338623fcab85534991f62bd67b609faf