[automerger skipped] Merge 10952656 am: aa291854af -s ours

am skip reason: Merged-In I9cded2f3675f46462e6b972afbe7119d5e6546c9 with SHA-1 436d3daa15 is already in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/hardware/google/interfaces/+/25089829

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