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

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

Change-Id: Ie8caf52c29b5363f20e571b2810ab1e05eb7cd4f