Merge "Add PhoneStateListener#onPreferredDataSubIdChanged"
am: 0875fbab4b

Change-Id: I4644f8e8522dc78e7febf28631f347df0bf16609