Merge "InternalNetworkManagementException Changes" am: 27c75f17a6 am: 53db8ea3c0

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

Change-Id: If60cd0ae8813044a4f66e76feb4829006bfe6210