Merge "Fix order of uid/pid in LocationAccessPolicy" into rvc-dev