Merge changes from topic "presubmit-am-c3625e4a765a49fbbcf95d13c9cb0482" into...

Merge changes from topic "presubmit-am-c3625e4a765a49fbbcf95d13c9cb0482" into tm-mainline-prod am: 5bb32a9a

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



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