Merge changes from topic "presubmit-am-84a230a232954fbd95417a65170e2a87" into...

Merge changes from topic "presubmit-am-84a230a232954fbd95417a65170e2a87" into tm-mainline-prod am: 07f5bf32

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



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