Merge changes I2dfd304c,I978432e2 am: a335badc22 am: 509d54d0d4

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

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