[automerger skipped] Merge "[Testing] Remove Robolectric import and use AndroidJUnit4 instead in MobileDataEnabledListenerTest" am: f5fa52884b
am: 49936c5eb5
am: ccc406381a
am: 3864e2f218
am: 5d1da01e80
-s ours
am skip reason: Change-Id I81b3d6ac075666a45649c8d811832a40bdb1b41b with SHA-1 c3aa6d26ee
is in history
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1427810
Change-Id: I11de226ad2a03c82c556c840593acc60ae553e00
This commit is contained in: