Merge "Avoid activity restart by config changes while test" am: cf8d28a8ff

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

Change-Id: I51fd6399a2862d14b4305803fe87eb4a01b99089
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>