Merge changes from topic "presubmit-am-475dec6c757f49f4a955c5c54f64331b" into...

Merge changes from topic "presubmit-am-475dec6c757f49f4a955c5c54f64331b" into tm-mainline-prod am: 60aa1c46

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



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