[automerger skipped] Merge "Fix bug of default data / voice / sms sub is...
[automerger skipped] Merge "Fix bug of default data / voice / sms sub is cleared unexpectedly." am: 24640f8f am: 0a4cea0b
am: a5c2f666 -s ours
am skip reason: change_id I4520ec72e2db6846f8c00981a624d8e4763ae777 with SHA1 b7df4e0b is in history
Change-Id: I5d8403a0db1a40d82412df2eb1543b1ac5a4bfbc