Merge "CTS - reorder racy network scorer test" into stage-aosp-sc-ts-dev am: a39299f08c am: c4a93635f1 am: cca22ace57

Original change: https://googleplex-android-review.googlesource.com/c/platform/cts/+/15643460

Change-Id: I1bd552ef1ccec255ec132684f862444ec51adb86