Merge "Fix flake in testMobileDataAlwaysOn" am: 02ea3f55c1 am: b9b4ee6d0e am: 0c865b6ff9 am: 51f17658d0

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

Change-Id: Ib04ce67f156fbc7272de1e7c43b697f894f97dc4