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

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ie69cc409c24468aaebb4a0267009bdc4f9b7a622