Merge "Fix PrivacyChip not visible issue" into udc-dev am: 7a84a295 am: f811714e am: 53e08894 am: 8273e34a

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



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