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

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

Change-Id: I36439eefde3b70f0baa782e0027e62f595997125