[automerger skipped] Merge "Check if calling uid is system uid for...
[automerger skipped] Merge "Check if calling uid is system uid for setAllowedPolicyCapture." into stage-aosp-master am: 12b147fe -s ours
am skip reason: Change-Id I614ac881ecde6bad13f22f1382de701f314a7ada with SHA-1 56d41830 is in history
Change-Id: I297555c0b41b6acd83b83ecb60cebb5663a59203