Merge changes I97fd41f8,Iab3c970b am: 98319e92a6 am: 1db5a61aed

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

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