Merge changes I844f3e88,Ia4feb8ce,Ia87d3ea0 am: 9dc8e53e7c am: a6f9c76492 am: 8c66a64da3

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

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