[automerger skipped] Merge "Check if calling uid is system uid for setAllowedPolicyCapture." into stage-aosp-master am: 12b147fe0d -s ours am: 73a43a9ffe -s ours am: 3d723e4244 -s ours

am skip reason: Change-Id I614ac881ecde6bad13f22f1382de701f314a7ada with SHA-1 56d4183046 is in history

Change-Id: Icd5731d3ac91c8e87b20b41ee32d26b6bc95ea03