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

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

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