Merge "Check test assumption before starting test activity" into stage-aosp-sc-ts-dev