Merge "Set NetworkStack targetSdk to 28" am: 3e15c9f9ba am: 4be31060a2
am: 6026ca9552

Change-Id: I6c02ff70600b1dc32e989493e6dfa924c0ef8b61