[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 am: b58db8a7 -s ours am: b28c6bfb -s ours

am skip reason: subject contains skip directive

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

Change-Id: I2b75fbf9002a849a4633ad5cb11e038b1818dfff