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