Merge changes from topic "presubmit-am-322446ebe6a54dce8ebbe6aec53a6609" into sc-dev-plus-aosp am: df321f759b am: fc68263dac

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

Change-Id: I30ffc4ca36c3cf306cda2b32296d74ca0f3bc70a