[automerger skipped] Merge "[Testing] Use AndroidJUnit4 instead in...

[automerger skipped] Merge "[Testing] Use AndroidJUnit4 instead in TelephonyTogglePreferenceControllerTest" am: 71c66732 am: 48c399c1 am: 7c9cc562 am: 7f3bbcdd am: 7b7382fd -s ours

am skip reason: Change-Id I3d6c39f45cb1efb1742148f20f03372214eb0cbe with SHA-1 d2e9e42f is in history

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

Change-Id: I23e5dbb3a2cceeeab6b1d1dd1a89bee6f8fce21f