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

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

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