Fix ordering of visibility modifiers to match JLS

Bug: 63742
Change-Id: I83ff14f0d7fcdc1d28d83577fbd3b5ff20befe7a
Merge "Fix ordering of visibility modifiers to match JLS"