Merge "[Testing] use AndroidJUnit4 in new MobileDataPreferenceControllerTest" am: 27806fde5e am: e0890849cd

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

Change-Id: I88eeb86872e17fa03385dad601ed5e11f9b176d7