Merge changes from topics "presubmit-am-076a0ae4a9ac43fb986ada680ae53e89",...

Merge changes from topics "presubmit-am-076a0ae4a9ac43fb986ada680ae53e89", "presubmit-am-fc86299402a24233b0eba91a20955958" into tm-dev am: a247d9f8 am: 25bd6a54

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



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