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: I631120863f975a1940d6cdb756128cff1a343f29