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

[automerger skipped] Merge "[Testing] use AndroidJUnit4 in new EuiccPreferenceControllerTest" am: 1cd8904f am: 8c58bd45 am: e570e80e am: 24dc71f7 am: 4d513437 -s ours

am skip reason: Change-Id I028ca81d38252beb3abccef9e938988510f3f55e with SHA-1 4126ec2d is in history

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

Change-Id: Iba258a6fb4ac6baf8f784c9f9a433bf1388bd1ee