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

Change-Id: I60ce846bf0f4bd2704e57f428cf5f69a47e98d15