Merge "Remove unnecessary 'final' modifiers in AccountManager"