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

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

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