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