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

Merge changes from topic "presubmit-am-b8ca5387cf2444ff9a850aadfac52f65" into tm-mainline-prod am: f90c365d

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



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