[automerger skipped] Merge changes I385860db,I52fc5134,Icfcea3d6 into main am: 4b64af21a0 am: fa2b2f6cdc -s ours

am skip reason: Merged-In I832ab7a8b5445ba85e27bbcf5be64906bfa0e5be with SHA-1 ec1198d941 is already in history

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

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