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

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

Change-Id: Ibc94fb02093174178c54eaf2924e4520ef5e4633