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

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

Change-Id: I5dd08ce187c592dcb3bd0f317449b2312b75f680