[automerger skipped] Merge "Remove unused...

[automerger skipped] Merge "Remove unused android.net.conn.NETWORK_CONDITIONS_MEASURED" am: 040b3972 am: 66151444 am: 326198a7 -s ours am: 136b7a63 -s ours

am skip reason: Merged-In I12050737291c7fa0ebff4e7411b91f4c6f57a413 with SHA-1 3fcd0c4a is already in history

Original change: https://android-review.googlesource.com/c/platform/packages/modules/NetworkStack/+/1700806

Change-Id: I672d40bfea9e4e49ebefb9da0ad6fa38c2e2ba7c