Merge "Create an until function to check location permission" am: 948c4086af am: b896ed6e19

Change-Id: Ic868fbfa4d9b9199e754c5b6aacf97990245e95e