Merge "Allow the System UID to unregister ConnDiags CBs." am: 4068bd9259

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

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