Merge "Fix flake in testMobileDataAlwaysOn" am: 02ea3f55c1

Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1755251

Change-Id: Ide762b07177c861a7308690a8e39040de2414506