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

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

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



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