Merge changes I3b0c6325,I40f97f4b am: a55e702324 am: 76c6b3a669

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

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