[automerger skipped] Merge changes I86ba4225,I04d8e19a into main am: 926c26500c am: a9040abe2f -s ours

am skip reason: Merged-In I86ba422524e79af6b318b50bd6eebe2cb27fa50a with SHA-1 ba1854fb0e is already in history

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

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