Merge "Adding callback for setPreferredDataSubscriptionId." am: 442084c722
am: 7a2dd73329

Change-Id: I5c19983a4830d65701e6a703a9a874eb27b4c2ef