Merge "Revert "Move LocationAccessPolicy""