Merge changes Ib89e0924,Id2816580 am: 2100e6323c

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

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