Merge "Use filegroup defaults for framework sources" am: 41ad986490 am: 2b246a30df

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

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