am c157cac9: Merge "System package permission decls take precedence over 3rd...
am c157cac9: Merge "System package permission decls take precedence over 3rd party apps\'" into klp-dev
* commit 'c157cac9':
System package permission decls take precedence over 3rd party apps'