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