Merge "Update setCdmaRoaming/SubscriptionMode APIs"