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

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

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