[automerger skipped] Merge "DO NOT MERGE: Register NetworkController to DumpManager" into sc-dev am: def23772a7 am: 7c51d30f77 -s ours

am skip reason: subject contains skip directive

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

Change-Id: I3375c1d01d9bfc537a40996bfb716eeb8b058b29