Merge changes I88ee8d2f,Id15ecc7f into main am: c081fa39 am: 58445c73 am:...

Merge changes I88ee8d2f,Id15ecc7f into main am: c081fa39 am: 58445c73 am: 14a73440 am: ad3fec95

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



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