Merge "Allow the System UID to unregister ConnDiags CBs." am: 636f8cbced am: 5d0cc85448

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

Change-Id: I5b6a900611b727ee58a5b1f2762ed10b5a24fe44
tree: b56a525574fb127db406f424d2d63fcf16dcb9a8
  1. core/
  2. services/
  3. tests/