Merge "Remove sendNetworkConditionsBroadcast" am: 6a6fa67d58 am: fc1928cedb

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

Change-Id: Ib6299c1022f196453aa6f072bcc9ba7227bfe8f4