Merge "DeactivateDataCall remove network on all errors" into tm-dev am: 54d7eb4497

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

Change-Id: I60718ed35e87cb231d48cd0270f6b65b78f366dd