Merge "Grant location to default launcher" into oc-mr1-dev
am: 25e5a3446e

Change-Id: I25f08bcfd2d0774800f975cde195bc01f23734a9