Merge changes I0f86c823,I8c6760a7 into tm-dev am: 3263c71445 am: f041f8bb7b am: 9a9240e6e5 am: 0ec853315a am: 97ae5c9fe1

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

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