[automerger skipped] Merge "Fix PrivacyChip not visible issue" into sc-dev am:...

[automerger skipped] Merge "Fix PrivacyChip not visible issue" into sc-dev am: b40db93c am: 31f92bcd am: 182640fb am: c28b9ad9 am: 7805dfb4 -s ours am: 879e951e -s ours am: b5e22e7e -s ours am: b8021e16 -s ours

am skip reason: Merged-In I9851e6ed4cb956d0459ef56251eb0ef3210764b8 with SHA-1 8ec552f4 is already in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/23386456



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