Merge "Experimenting with detecting whether a test runs in presubmit" into ub-launcher3-qt-qpr1-dev
am: 37cc797fd0

Change-Id: I0ab81659ea9aaf6b75cd1106bbbaf9c75c679a41