Merge changes from topic "presubmit-am-603b5f68c48f47bbbd458305f0cba030" into tm-dev am: d334885508

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

Change-Id: I731bb5006b9cf512370cf9bcd94f4cac86c8f083
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>