Merge changes I9f6bb947,Iff72dbea into main am: c3790fe083

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

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