Merge "[Testing] Use AndroidJUnit4 instead in TelephonyBasePreferenceControllerTest" am: 177533ddbb

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

Change-Id: I8342d2c6813115f9705ca2e5ef201125ea0f9576