Merge changes I0f86c823,I8c6760a7 into tm-dev am: 3263c714 am: f041f8bb...

Merge changes I0f86c823,I8c6760a7 into tm-dev am: 3263c714 am: f041f8bb am: 9a9240e6 am: 0ec85331

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



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