Merge "Add FrameworksNetDeflakeTest"
am: 882558700b

Change-Id: I9f07a447c76e4464a368c6ec033d2141e59edee9