Merge "Remove sendNetworkConditionsBroadcast" am: 536e82f56b am: d37e995263

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

Change-Id: Ib6299c1022f196453aa6f072bcc9ba7227bfe8f4