Improve default grants

Sync default grants with [[mw:Auth systems/OAuth/Design/Grants]].

Change-Id: Iff3d5b021034a21ce97aa77510ec39c799c8d636
Merge "Improve default grants"