Merge changes from topics "phone_cap", "tdscdma", "update-regstate-rplmn"
am: 868156ace2

Change-Id: Iad296d2f1c0256a191932e00ac7a3bd79f8562fa