Merge "Prepare T build rules for backwards compatibility" am: a6ee639dca am: dd96722290 am: 104f26ee64

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

Change-Id: I62c7bcbf82a3c6541dae1c3c0aaaf22818ffdd18