Merge changes I07c0f96d,I8734474f am: 5440b366 am: a629baed am: bc8a276d...

Merge changes I07c0f96d,I8734474f am: 5440b366 am: a629baed am: bc8a276d am: c10a62aa am: ebe3a86f

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



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