Merge changes Ic8eaee53,Ide961d91,Ie97f3ce9 am: 99d4458c3b

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

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