Merge "add getPreferredDataSubId to SubscriptionManager and rename setPreferredData -> serPreferredDataSubId"
am: 396e01a168

Change-Id: I0fb8572c7a7c12aad124609dc62283061879afcf