[automerger skipped] Merge "Remove sendNetworkConditionsBroadcast" am: 6a6fa67d58 am: fc1928cedb am: a450fc8a3f -s ours

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

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

Change-Id: Ic88418e136ccd5bfb691f5ea02c7c01e3a8bd4a5