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

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

Change-Id: I2c016f1797b0fa4546eb21e3c919d469fb75ace5