am 26bb9c95: am 0d17aaa5: Merge "Grant optional permissions by default for...
am 26bb9c95: am 0d17aaa5: Merge "Grant optional permissions by default for system apps." into jb-mr2-dev
* commit '26bb9c95':
Grant optional permissions by default for system apps.