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: I6355403c6c7d2b3e918a39241c3e9ab2237706e4
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>