Merge "Fix flake in testMobileDataAlwaysOn" am: 02ea3f55c1 am: b9b4ee6d0e am: 711a2964a2

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

Change-Id: If7aff8e8477bcf4a862fe4a88be7e4eb72b2fcbb