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

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



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