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

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

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