Merge changes from topic "cherry-pick-b210883464" am: ed0da8c2 am:...

Merge changes from topic "cherry-pick-b210883464" am: ed0da8c2 am: ec07ad17 am: defdd85a am: 2e8f7115 am: 9517c708

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



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