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

am skip reason: Change-Id I479c8fc123d5a994e8cbe6489aa00bea4abca1c7 with SHA-1 7e826f9531 is in history

Change-Id: I717dccf9f712c5bbfb620fbaeb91a69f8cc094b6