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

Change-Id: I3af88995a99ce846962c71454323f68ad527c401