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

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ic97c893a17dcf7ce18fe31ff05828d4fe9a5e929