Merge "Add PhoneStateListener#onPreferredDataSubIdChanged" am: 0875fbab4b
am: 4190b87df6

Change-Id: Ic83970e95380071b1f3c1aa0be2fda49889776f6