[automerger skipped] DO NOT MERGE - Merge TP1A.220624.013 am: 035ee7b9 -s...

[automerger skipped] DO NOT MERGE - Merge TP1A.220624.013 am: 035ee7b9 -s ours am: 8214478d -s ours

am skip reason: Merged-In I25e8f827645db8e83c8c3142f5e76a912fdf7b22 with SHA-1 6973e79b is already in history

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



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