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

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

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