Merge "[Testing] Use AndroidJUnit4 instead in TelephonyBasePreferenceControllerTest" am: 177533dd am: fc6cb188 am: be8b195f am: 2f068a91

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

Change-Id: Iafcefc2aa64cf3c50b1d139ec0204a315be29da7