Merge "System package permission decls take precedence over 3rd party apps'" into klp-dev