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

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

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



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