[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 am: 20fdbff5 -s ours

am skip reason: Merged-In I4dafb7bf5b410d99cba7e30ee17f966611458db7 with SHA-1 0b365c3e is already in history

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

Change-Id: I1c38bd145ccea8794d470cd79a4d817093ff2169