[automerger skipped] Merge "Ignore testFactoryReset in instant app mode" into sc-dev am: 75eb9e6ba9 -s ours am: e28ff5fe5b -s ours
am skip reason: Merged-In Icd4a1b2316608ea03a4f7afb32e39400af71950c with SHA-1 766573f4f0 is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/14965964
Change-Id: Id4ad08a3135f9071d987c272df2f46fc9ccec1ef
This commit is contained in: