[automerger skipped] Merge "Check if calling uid is system uid for...

[automerger skipped] Merge "Check if calling uid is system uid for setAllowedPolicyCapture." into qt-qpr1-dev am: a6544e3b -s ours am: 888b2239 -s ours am: 8ca0e66b -s ours am: fe1cf307 -s ours
am skip reason: Change-Id I614ac881ecde6bad13f22f1382de701f314a7ada with SHA-1 140a34fb is in history

Change-Id: I859c79956226ca36e3127f7fbc59ffc07c66c460