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

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

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