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

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

Change-Id: I497b71bf3a54c177f1b6e2cd63b3588b3c85f2cb