Merge changes from topics "presubmit-am-596328b67ac6460085f1e3241a26b3ef",...

Merge changes from topics "presubmit-am-596328b67ac6460085f1e3241a26b3ef", "presubmit-am-c0609aada2e345e58e5c80c644f9e20f" into tm-dev am: f5d79520 am: 62144c83

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

Change-Id: Ibd72ef63e608642ac40360e54541a63b710e352c