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

Change-Id: I3e04a4b2d769beac85a013dafc777ac60f7080f1