[automerger skipped] Merge "DO NOT MERGE: Register NetworkController to...

[automerger skipped] Merge "DO NOT MERGE: Register NetworkController to DumpManager" into sc-dev am: def23772 am: 7c51d30f -s ours am: 4fb914b0 -s ours am: baceccf0 -s ours

am skip reason: subject contains skip directive

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

Change-Id: I3e6bd234acdf569b87993773af304abbaacb8c7d