[automerger skipped] Merge "Android W -> B for finalization scripts" into main am: a458074ca3 am: 1c549ffb48 -s ours

am skip reason: Merged-In Ib9fcdda063cb0b9589b1e54244726c2011175bed with SHA-1 e2a145cd63 is already in history

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

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