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

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

Change-Id: I8f9622fd3ed66628d94b3dd933e2ce4c90f260e1