Merge changes from topic "plug-in-statusbar-chip" into tm-qpr-dev am:...

Merge changes from topic "plug-in-statusbar-chip" into tm-qpr-dev am: c40548e6 am: 5047fff0 am: f554a63d

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



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