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

Change-Id: I442f354967a37b11b9d149f2c89de1f30332aadb