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

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

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