Merge changes from topic "presubmit-am-8f442d1c92134c4e9787bcb9dbd6a7a7" into...

Merge changes from topic "presubmit-am-8f442d1c92134c4e9787bcb9dbd6a7a7" into tm-mainline-prod am: 0f5eeca9

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



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