Merge "Modify LocationAccessPolicy to use LocationManager" into pi-dev am: 8404d082c4
am: 0713d63e17

Change-Id: I254dac327a391af5828bb9adde0254cf1a0814a4