am 135e2ce5: am 53c75014: Merge "Add OrSelf to privileged permission check." into mnc-dev

* commit '135e2ce571fee7d64572454f55151225bcf22464':
  Add OrSelf to privileged permission check.