[automerger skipped] Merge "Fix order of uid/pid in LocationAccessPolicy" into...
[automerger skipped] Merge "Fix order of uid/pid in LocationAccessPolicy" into qt-dev am: a2b7cd53 am: 2994fd85 -s ours
am skip reason: skipped by user hallliu
Change-Id: Id4e075e339eb25f43c5fbf267203be606a4f084c