Merge changes Ie7e60128,I1a648227 am: 115b1a7dae am: 55aed9749d am: e1ac0f101c

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

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