[automerger skipped] Merge "Prepare T build rules for backwards compatibility" am: a6ee639dca -s ours am: 6b73865aea -s ours

am skip reason: Merged-In I37c7385b456e4d71789aafe33cc8375adf40a681 with SHA-1 955c33c267 is already in history

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

Change-Id: Ib39e66fba0fc7a60dfc6f1287a1aa5b24a659a06