Merge "Fix PrivacyChip not visible issue" into sc-dev am: b40db93c am: 31f92bcd

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



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