[automerger skipped] Finalize 202504 in AOSP am: f386af0a am: e91549ae -s ours

am skip reason: Merged-In Ibff72bad06fbc92e6f26854f7218a23b89bace19 with SHA-1 9df02453 is already in history

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



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