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

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

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