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

Change-Id: Ifd57ebc57827c33de9bb91d4cf629a73c2c41932