Merge "Update chipbar text view in new events" into tm-qpr-dev am: fd544fa6 am: 90341ecc

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



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