[automerger skipped] Merge "Fix order of uid/pid in LocationAccessPolicy" into qt-dev am: a2b7cd539e am: 2994fd8537 -s ours

am skip reason: skipped by user hallliu

Change-Id: Id4e075e339eb25f43c5fbf267203be606a4f084c