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

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

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