Merge changes from topic "presubmit-am-a5f5938f12924a3c9c42aad60c88563d" into tm-dev am: 9742b1eb

Original change: https://googleplex-android-review.googlesource.com/c/platform/build/+/17654271



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