Merge changes Ided4e9bb,I2808441c am: 19345258e5

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

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