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

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

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