Snap for 8547970 from 79766d67e50eeddd1f068b5c3f01da02935f9c6b to tm-release am: 8f3d8be8c3

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

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