am 9b02cff8: am 0bc60661: am 67a32c49: Merge "Added missing check for MANAGE_USERS" into mnc-dev

* commit '9b02cff8f48f4cc74ddb4e0ead3ebb28fd7c7e0b':
  Added missing check for MANAGE_USERS