Merge changes I9e06f025,I413c3803 am: 7b27d7bcc6 am: 380f7e1461 am: fcf7b3d82d am: d6c583fabb am: c315bdd501

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

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