[automerger skipped] Merge "Create an until function to check location...

[automerger skipped] Merge "Create an until function to check location permission" am: 948c4086 am: b896ed6e am: a7a2825a -s ours
am skip reason: Change-Id I5558ed04e5ef28033a1c649f5491f2f15aa63557 with SHA-1 97d01e2f is in history

Change-Id: I6cae60b3e177e0a345053ad3397db083379d2f70