Merge "Fix PrivacyChip not visible issue" into sc-dev am: b40db93c am:...

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

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



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