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

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

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