Merge "Ignore testFactoryReset in instant app mode" am: f3283e6b93 am: c60aab0243 am: c17bbec538

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

Change-Id: Icd885192e55d9fc47e98841bd65d4ccebc02123c