Merge changes I0f86c823,I8c6760a7 into tm-dev am: 3263c71445 am: f041f8bb7b am: d4fda86b2c am: 3829886354 am: f5458f62f6

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

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