Merge changes from topic "presubmit-am-34a614a547fa4fdcae3fee7586500690" into tm-mainline-prod am: 05fd4d7f

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

Change-Id: I68c8047dcf205257477c76e0f45533f3b7a62815