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

* commit '57a992021b2279f34265eb403816417a1ce682f2':
  Add OrSelf to privileged permission check.