Merge "Fix the multiple instences of NetworkProviderSettingsActivity issue" into sc-dev am: b121a52359
am: 61c5877a26
am: a6c8b9f837
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15135727 Change-Id: I14e71c52fd29977c630019af73026d3465e68803
This commit is contained in: