Merge "Fix order of uid/pid in LocationAccessPolicy" into qt-dev am: a2b7cd539e

Change-Id: Ibe111442fec745063b27e9804c7125feee1fffc2