Merge "Revert "Move LocationAccessPolicy"" am: 1fc7817981 am: 2b7bda6ebd
am: 9942fed2c3

Change-Id: Iab6bf32be3076929ac41201de4b7fc2a68643177