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

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

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