Merge changes If33bee4e,I0c14c062 am: 6ca63b0e20

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

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