[automerger skipped] Merge changes from topic...

[automerger skipped] Merge changes from topic "presubmit-am-3cc3de9f6a154c869e57eba3d059bade-sc-dev" into sc-mainline-prod am: 9877f69b -s ours am: 1945ed2e -s ours am: 8cce6fd8 -s ours am: ce2a1e30 -s ours

am skip reason: Merged-In I800f0f39a469a95eb36eeaaeb2aa60a39fd916d3 with SHA-1 c55b5b54 is already in history

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



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