Merge "Grant optional permissions by default for system apps." into jb-mr2-dev