Merge "Fix visibility issue in AccountManager.getAuthTokenByFeatures." into oc-dev
am: f1946baae7

Change-Id: Iacba4bd641367f5cf64bcd4d7098bba05fca835d