Merge "InternalNetworkManagementException Changes" am: 27c75f17a6 am: 1f9c0d6cf3 am: 619adece62 am: e7d4aa1e1c

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

Change-Id: I1b9805f75fee091086b38f95ebd3872e98bfd879