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

Change-Id: Ic66db8504d02a22d8da38159e6d2fcf6decd1878