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

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



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