Merge "InternalNetworkManagementException Changes" am: 27c75f17a6

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

Change-Id: I272d569228edf6da00f55601d317b6c182746d89