[automerger skipped] Merge Android 12 QPR3 ab/8391262 am: af017bd4e4 -s ours am: e2a73e0108 -s ours

am skip reason: Merged-In Ia6f0723980fad80eb24e6de349d5fed8b04176bc with SHA-1 1899e4e30d is already in history

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

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