[automerger skipped] Merge "Apply BLUETOOTH_ADMIN permission for BluetoothDeviceDetailActivity" into rvc-dev am: 21ac98e2f1
am: c36fe51faf
-s ours am: 6cb1c40ae1
-s ours am: aee23dc6fc
-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: I5f946645a47b70b4f664a6609e759c15fd7ba671
This commit is contained in: