Merge "Fix PrivacyChip not visible issue" into sc-dev am: b40db93ccc am: 31f92bcdcf am: 182640fb27 am: c28b9ad9e9

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

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