Merge changes If396a5ce,I8de367ce into main am: c546b2b1a6 am: 69d4854471

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

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