[automerger skipped] Merge "Merge TP1A.221005.003" am: cf2da65b am: dd05140c -s ours

am skip reason: Merged-In I1fcfa29d7841a1cb73bafb1ea92f3b1630992ae9 with SHA-1 f16c6d3a is already in history

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



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