Merge changes I422445af,I9c995127 into main am: 8954a83c93

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

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