[automerger skipped] Merge "Allow the System UID to unregister ConnDiags CBs." into rvc-qpr-dev am: 07dd48319d -s ours am: 1338b6c158 -s ours
am skip reason: Change-Id I20d0cad5f902708d366aa703c2893b0ea3e55052 with SHA-1 054451e170 is in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/13169565
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I766b99d3fdba7eb7a556adf808e5041ad70a7a51
This commit is contained in: