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

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

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