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

* commit 'd247d8b4aa6eff39fad55c04e47d0d92d9c69751':
  Add OrSelf to privileged permission check.