am 05feded4: am 8144aa2e: Merge "Allow system apps to be granted android.permission.PACKAGE_USAGE_STATS" into mnc-dev

* commit '05feded4f153707eadefe04f727be962b3e87778':
  Allow system apps to be granted android.permission.PACKAGE_USAGE_STATS