[automerger skipped] Merge "Apply BLUETOOTH_ADMIN permission for BluetoothDeviceDetailActivity" into rvc-dev am: 21ac98e2f1
am: c36fe51faf
-s ours am: 6cb1c40ae1
-s ours
am skip reason: Change-Id Icbc5879301fec9a7deacd7ee2896fd41b6feab7a with SHA-1 1633ae37e7
is in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/11489511
Change-Id: Ifb7decfc74757b807fad4aacd9ea1da49bdeb133
This commit is contained in: