[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: b393d426 am: 56299d80 -s ours

am skip reason: Merged-In I9851e6ed4cb956d0459ef56251eb0ef3210764b8 with SHA-1 20ea049a is already in history

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



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