[automerger skipped] Merge changes from topics "phone_cap", "tdscdma", "update-regstate-rplmn" am: 868156ace2 am: beded753de am: 4b8b63c804 -s ours
am skip reason: Change-Id I43df3cffd4c55f2c5df8eaf0235772e5930dced5 with SHA-1 8f6b67b0a6 is in history

Change-Id: I3fa3886c64f072130198cddecf1eeee7571e4a88