[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: eaea8772 am: 7860f546 -s ours am: e15d05a7 -s ours

am skip reason: subject contains skip directive

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

Change-Id: Iece54caf5cfb2038376ecfe1053007b59d8a51bf