[automerger skipped] Merge "Prepare T build rules for backwards compatibility" am: a6ee639dca am: dd96722290 am: 104f26ee64 am: b39fd999f9 -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: I9cc985428aebd3d72a5628ba6d451c98eb2b2ab3