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

Merge changes from topic "presubmit-am-e7bd37b8d4a54cc5a85736dbe59d11b1" into tm-qpr-dev-plus-aosp am: cbcde78d am: f85af514

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



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