Merge changes from topic "presubmit-am-0651c487cd154255bf456a4440382627" into...

Merge changes from topic "presubmit-am-0651c487cd154255bf456a4440382627" into tm-mainline-prod am: 1ae66ae2

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



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