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

[automerger skipped] Merge "[Testing] Use AndroidJUnit4 instead in TelephonyBasePreferenceControllerTest" am: 93cec35c am: b4093123 am: e13fa41a am: 722f9f4e am: c0dbafc4 -s ours

am skip reason: Change-Id Iabe24aef0b7a5c3aa9d7be275f0c4ed552cdd2e8 with SHA-1 933e4df3 is in history

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

Change-Id: Ie2c1e7c09dc8263f2230d708767866a43de0fa24