[automerger skipped] Merge "Ensure settings maintains its Bluetooth device inquiry state" into sc-dev am: 524f4979f5
-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: Iec11cfe0a09807d80cf2b32e0ce311c736c36e43
This commit is contained in: