Merge \\"Grant location permission to camera app.\\" into nyc-mr1-dev am: 400960a40e
am: e2c0df0c72

Change-Id: Ib6940ec6863f65f0333f5965fc8ae3528b730ad3