[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: a21a5a69 -s ours am: 4a2dac4f -s ours

am skip reason: subject contains skip directive

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



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