Merge "[Chipbar] Don't add null icon descriptions to the main description."...

Merge "[Chipbar] Don't add null icon descriptions to the main description." into tm-qpr-dev am: 6fa49434 am: 1d5d5025

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



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