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

Change-Id: I2575c6caaf3438338ab34d26c7900a28e7beac69