Merge "Move LocationAccessPolicy" am: 622a1ed2da
am: bb6c06a540

Change-Id: I91819c29529f1d7d8beb12f5aafcc3fa7c7bdbfe