[automerger skipped] Merge changes from topics "getLine1Number fix", "sms_corruption", "Initial RCS CL" am: 1e8399f1ab am: 5f2441c343
am: 62f9aa44f7  -s ours

Change-Id: I2e0887aeed83b003e59e4f741ce24738e1511bfa