[automerger skipped] Merge changes from topic...

[automerger skipped] Merge changes from topic "presubmit-am-8c4ee5d0c6b544bab2b8403178df17cc-sc-qpr1-dev-sc-dev" into sc-qpr1-dev am: 4b12201e -s ours am: 57643513 -s ours am: 8cf511b7 -s ours am: 9ab2f7b6 -s ours

am skip reason: Merged-In Ia18f367109df5af7da0a5acad7702898a459d32e with SHA-1 22869d90 is already in history

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



Change-Id: I31a8f427b45eee135a7e498cee57fc009a6ba70a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>