Merge changes I07c0f96d,I8734474f am: 5440b3663c am: a629baedb9 am: bc8a276ddd am: c10a62aa59

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

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