Merge "Set NetworkStack targetSdk to 28"