Merge "Stop AndroidFrameworkContextUserId on UserManager"