[automerger skipped] Merge "Remove sendNetworkConditionsBroadcast" am: 536e82f56b am: d37e995263 am: 7e3fb2c18a -s ours am: d5d17ef234 -s ours
am skip reason: Merged-In I7b43940dc32826c70fa82f471b35bc5cb8394aad with SHA-1 792f554dc9 is already in history
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1702485
Change-Id: I8e0b829997a7f8dce16bc318ed90501f198766f1
This commit is contained in: