[automerger skipped] Merge sc-v2-dev-plus-aosp-without-vendor@8433047 am:...

[automerger skipped] Merge sc-v2-dev-plus-aosp-without-vendor@8433047 am: 99d834b0 -s ours am: 024fe4b3 -s ours

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

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



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