[automerger skipped] Merge "[Testing] use AndroidJUnit4 in new...

[automerger skipped] Merge "[Testing] use AndroidJUnit4 in new MultiNetworkHeaderControllerTest" am: 3eeb8b44 am: 27978c5d am: 5f81bb9a am: bb98b793 am: 6ace0ecd -s ours

am skip reason: Change-Id Ic66425aca4047d2eacd04509f3bfb315f6dd57fc with SHA-1 a1aaccf6 is in history

Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1426552

Change-Id: Iab38a1060b1fb43dc105da9a095d587b2a241fe5