Merge changes from topic "presubmit-am-322446ebe6a54dce8ebbe6aec53a6609" into sc-qpr1-dev am: 8d0efdd63c

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

Change-Id: If95e6f0cabaced7cbb89dc8632a73fdec5d5aa94