Finalize 202504 in AOSP am: f386af0ac6

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

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