[automerger skipped] Merge "[Testing] use AndroidJUnit4 in new MobileDataPreferenceControllerTest" am: 27806fde5e
am: e0890849cd
am: 000159f6db
am: 6513978872
am: 580963266b
-s ours
am skip reason: Change-Id I1a2d7b38023681f3db3320aa9f315109280cfbd0 with SHA-1 ff6bc3ce27
is in history
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1426553
Change-Id: Idd0fa5686c61c0e575bca33e2990a1486429bbde
This commit is contained in: