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

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

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

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

Change-Id: I781296f41801941ee3869fc5e9e61f419f3769b8