[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: c91a964d -s ours am: c33ab36a -s ours
am skip reason: Change-Id I614ac881ecde6bad13f22f1382de701f314a7ada with SHA-1 140a34fb is in history

Change-Id: I927655bc12e12f39d841deccaf45d085f3946dc6