[automerger skipped] Merge "Ensure settings maintains its Bluetooth device inquiry state" into sc-dev am: 524f4979f5
-s ours am: d518269171
-s ours am: 7e3763d6dc
-s ours
am skip reason: Merged-In I4dafb7bf5b410d99cba7e30ee17f966611458db7 with SHA-1 43c3ba86cd
is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15178131
Change-Id: I2d4ea03949008f3b7dac59000fb906b0b19cf477
This commit is contained in: