Merge "Fix LocationAccessPolicyTest for hidden api usage"