Merge "AccountManager APIs use context.getUserId for "asUser" operations"