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

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



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