[automerger skipped] Merge "Add PhoneStateListener#onPreferredDataSubIdChanged" am: 0875fbab4b am: 4190b87df6
am: ecc6407263  -s ours

Change-Id: I0e331dd2fd9baa9248af45b8348fb4abbbd4e5e3