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

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

Change-Id: I123cfe5c1ea8d6f466bf831e87a8a11f8cf12e25
tree: 795adb86a54bd2239729440f20e7e21e29e15c15
  1. core/
  2. services/
  3. tests/