Merge "Fix PrivacyChip not visible issue" into udc-dev am: 7a84a295 am: 95c56a64 am: 6250dc04 am: ae0aa519

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



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