Merge changes from topic "presubmit-am-4ee0242921194944967c9931a13cc3bf" into sc-qpr1-dev am: b0f9ed4fe7 am: 29d85f6557

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/opt/chips/+/15752202

Change-Id: I3aeff9fb067f1895a3d214514fe0c5eba34bf507