Merge changes Ic8eaee53,Ide961d91,Ie97f3ce9 am: 99d4458c3b am: d6ccd8631f

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

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