Merge "Add ACCESS_COARSE_LOCATION to NetworkStack app" am: 8865471c2e
am: 0ec2229622

Change-Id: I4da63b3cd73c6b81fa76d0403cb73913d59b7eeb