Merge "Only update Carrier Merged WiFi state if it is default" into sc-dev am: 0732d746 am: fa856853

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14909852

Change-Id: I68be8629241bd2f567d128f96e5fb202e79d2521