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

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

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



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