[automerger skipped] [Testing] Use AndroidJUnit4 instead in telephony/cdma/ test files am: fbb61ba4d0
am: d64a350d86
am: 44812e5f61
-s ours
am skip reason: Change-Id I110727b643a6755ee888708bd1fb2a39cf524a2d with SHA-1 c707b90d0a
is in history
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1614987
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: Ifcf559468c6fb440e55146aa063712bdcb22880b
This commit is contained in: