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

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

Change-Id: I346259f506df37c26f71965d8022faac0cbeb574