Merge "Merge "DO NOT MERGE: Allow not executing "Network Connectivity Screen Off Test"." into nougat-mr1-cts-dev am: 544a48f791  -s ours" into nyc-mr1-dev