Merge "Add PhoneStateListener#onPreferredDataSubIdChanged"