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

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

Change-Id: Ic9150d57bae0716db12f18f142836dda3852d2e1