Merge changes Ib89e0924,Id2816580 am: 2100e6323c am: 8cea10689e

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

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