Merge changes I9e06f025,I413c3803 am: 7b27d7bc am: 380f7e14 am: fcf7b3d8

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



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