Merge "Fix wrong variable in AccountManagerService's TokenCache" am:...

                accountEvictor = new Evictor();

            }

            accountEvictor.add(k);

            mAccountEvictors.put(k.account, tokenEvictor);

            mAccountEvictors.put(k.account, accountEvictor);

            // Only cache the token once we can remove it directly or by account.

            put(k, v);