Merge changes I551bf9ab,Idaf19866 am: 6a242f300c

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

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