Merge changes Ided4e9bb,I2808441c am: 19345258e5 am: e03ea9f8ba

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

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