Merge changes I700b04d3,If56e449a am: 0179b6a940

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

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