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

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

Change-Id: Ia95bccb2f5be6b24ad528ee0f617085b5cf1d3c0