Merge "[SB Refactor] Update wifi network to inactive if carrier merged is...

Merge "[SB Refactor] Update wifi network to inactive if carrier merged is lost." into udc-dev am: a0ae7d2d am: 696261c8

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



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