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

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

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