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

[automerger skipped] Merge "[Testing] Use AndroidJUnit4 instead in TelephonyBasePreferenceControllerTest" am: 177533dd am: fc6cb188 am: be8b195f am: 2f068a91 am: 159de414 -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/+/1427809

Change-Id: If913ad6394001e9c917ac80d8c391b441dc929cf