Merge "Test for the current behaviour of updating a network's owner UID." am: e581224c6a am: 183d991f55

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I7ed6c0ba300b34e84db911cbe9554f63712e2a1c