[automerger skipped] Merge "Experimenting with detecting whether a test runs...

[automerger skipped] Merge "Experimenting with detecting whether a test runs in presubmit" into ub-launcher3-qt-qpr1-dev am: 37cc797f
am: 493ea23b -s ours
am skip reason: change_id I386c6ad29182170326c557252fe6e20a8d2af34a with SHA1 6d88752e is in history

Change-Id: I41ae40a1a2f5f747869e0a2f0a4664f543ea69a8