Merge changes I0f86c823,I8c6760a7 into tm-dev am: 3263c71445

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

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