[automerger skipped] Merge "add getPreferredDataSubId to SubscriptionManager and rename setPreferredData -> serPreferredDataSubId" am: 396e01a168 am: 242b982b71
am: 9439803c8c -s ours
am skip reason: change_id I67b18f1ef450c3d9e5615b3d2ec8a53a0691d7af with SHA1 6ca46074e1 is in history

Change-Id: Id9535ddd2f9d06bb852e0ddbdf37122f25599ed4