Merge "Fix PrivacyChip not visible issue" into udc-dev am: 7a84a295 am: f811714e am: b5e54e2f am: 1e1fc24f

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



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