Merge "Fix PrivacyChip not visible issue" into sc-dev am: b40db93c am: 31f92bcd am: 182640fb

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



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