[automerger skipped] Merge changes from topic...

[automerger skipped] Merge changes from topic "presubmit-am-3cc3de9f6a154c869e57eba3d059bade-sc-dev" into sc-qpr1-dev am: c2c5b158 -s ours am: 017fe089 -s ours am: b55e56b5 -s ours am: c1094637 -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: Iaaa99a9fbb1ad66203170e046a6be4ec72d5eaa5
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>