Merge changes I3b0c6325,I40f97f4b am: a55e702324

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

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