Merge "Add FrameworksNetCommonTests to CTS" am: c5f60e981a am: 07069c8c51
am: 23b186bed5

Change-Id: I872fb80e8a0b21144f0b66b33645a320dcd5dcf2