Merge "Fix privacy chip overlapping with statusbar icons" into udc-qpr-dev am:...

Merge "Fix privacy chip overlapping with statusbar icons" into udc-qpr-dev am: 943b1c87 am: 697eb0be

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



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