Merge "Add annotation for APIs that support Context.getUser/getUserId"