Merge "Merge "Stop executing if skip occurs." into android10-tests-dev am: 1e4793561f" into android11-tests-dev