Merge "all active branches are now T aware" am: d7c57379e7

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

Change-Id: If79aa6f2152ad8f1b1cc4fe75684877ecda6b44b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>