Merge "Move assumptions out of BeforeClass annotated method" am: d239146987 am: 445884242e am: b0202b25e1

Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1996910

Change-Id: I10a967525b8be4697910d6faceac5d691615888a