[automerger skipped] Merge "Ensure settings maintains its Bluetooth device...

[automerger skipped] Merge "Ensure settings maintains its Bluetooth device inquiry state" into sc-dev am: 524f4979 -s ours am: d5182691 -s ours

am skip reason: Merged-In I4dafb7bf5b410d99cba7e30ee17f966611458db7 with SHA-1 43c3ba86 is already in history

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

Change-Id: I6a4afa5d9b0d352faba7d8fa5f6c6568513d8c8e