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

[automerger skipped] DO NOT MERGE: Register NetworkController to DumpManager am: 2b79873e am: 22705699 am: f7c5e4be -s ours am: 2a39aac0 -s ours

am skip reason: subject contains skip directive

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

Change-Id: Id4c24ab741b0c78775aab0b609a01613da3f8dcf