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

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

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