[automerger skipped] Merge "Ignore testFactoryReset in instant app mode" into sc-dev am: 75eb9e6ba9 am: 65e4008df2 -s ours

am skip reason: Merged-In Icd4a1b2316608ea03a4f7afb32e39400af71950c with SHA-1 8afa20e5d2 is already in history

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

Change-Id: I1efb14854be3eec7e116526942cae46530e7f495