Merge "Allow the System UID to unregister ConnDiags CBs." am: fcb4e29a9c am: a8f74e302c

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

Change-Id: I5b6a900611b727ee58a5b1f2762ed10b5a24fe44