[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: e05bd5bc -s ours
am skip reason: Change-Id I614ac881ecde6bad13f22f1382de701f314a7ada with SHA-1 56d41830 is in history

Change-Id: If8e745194754fc98e88bdc8c5293d2ce86c80366