Merge changes I88ee8d2f,Id15ecc7f into main am: c081fa39df am: 58445c733c

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

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