Merge "Enable/disable FrameworksNetTests" am: d1ed1cb8b7 am: 045f47bc31

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

Change-Id: Id1819e5f4af41d325c1269dedb21347693314841