Merge "Improve getConnectionOwnerUid tests." am: 3695e752ff am: a7a6b5187a

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I82e9db5a466e6a40eaa92dfe45ed29447641d8e5