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

Change-Id: Idb1f49fbadd56de4a7d83263411b1be0c7dc34e1