Merge "Merge TP1A.221005.003" am: cf2da65bc8

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

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