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

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



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