Merge "Revert "Move LocationAccessPolicy"" am: 1fc7817981
am: 2b7bda6ebd

Change-Id: I082fb2aebee2c2ba4a720a7cc05085ca20fd5095