Merge changes I3b0c6325,I40f97f4b am: a55e7023 am: 76c6b3a6 am: 67342677

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



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