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

Merge changes from topic "presubmit-am-bb2e8b162b81429580ce5061b6f62cbb" into tm-mainline-prod am: ec414226

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

Change-Id: I47182f99c8b02a95a3b36b629d1469809c4a12cc