Merge changes Ie7e60128,I1a648227 am: 115b1a7dae

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

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