Merge "Fix privacy chip overlapped by status bar icons" into tm-qpr-dev am: 4dac733f

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



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