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

Change-Id: Ieaa643d6502e591fd9ae73bd502d00bb8dd51eec