[automerger skipped] Merge "Remove sendNetworkConditionsBroadcast" into...

[automerger skipped] Merge "Remove sendNetworkConditionsBroadcast" into rvc-dev am: 542d796a -s ours am: d277e078 -s ours

am skip reason: Merged-In I7b43940dc32826c70fa82f471b35bc5cb8394aad with SHA-1 64c30c61 is already in history

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

Change-Id: I67136183ff603f3a8028dbc538dc2176dc650ce7