[automerger skipped] Merge "Remove sendNetworkConditionsBroadcast" am:...

[automerger skipped] Merge "Remove sendNetworkConditionsBroadcast" am: 6a6fa67d am: fc1928ce am: a450fc8a -s ours am: 3ac32077 -s ours am: 1f3879ba -s ours

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

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

Change-Id: I569db92e9fb9e61ac6c280481806777d4d15142c