Merge "Merge "Fix privacy chip overlapped by status bar icons" into tm-qpr-dev...

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

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



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