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

Change-Id: I82589c5cf90d8dbb02bab757d58e8584bd05bdb8