Merge changes I9e06f025,I413c3803 am: 7b27d7bcc6 am: 380f7e1461

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

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