Merge "Better description and parameter name of setPreferredDataSubscriptionId"