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

Change-Id: I8f33606dc6a29c833e5405ff6bf8d9b7e3f46815