Merge changes I0f86c823,I8c6760a7 into tm-dev am: 3263c714 am: c657b2e8 am: 82ef6acb

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



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