Merge "Move LocationAccessPolicy"
am: 622a1ed2da

Change-Id: Id68096a447d38d666b22a6adbe2d7afca487a5ab