Merge "Simplify framework-t/Sources.bp" am: bddff8a2fb am: ecfd3d7f67 am: 2c3ac5f9dc am: 6e7491969b am: fcbffa2b4e

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

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