[automerger skipped] Merge "Added missed incoming call SMS support" am:...

[automerger skipped] Merge "Added missed incoming call SMS support" am: 6c244cdc am: a533f225 -s ours am: 242868f7 -s ours am: 71f5ad08 -s ours am: 5d28d250 -s ours
am skip reason: Change-Id I6da064bd20f3b187f2e5b74376af694bfb612c54 with SHA-1 1e05f4a4 is in history

Change-Id: I29e6696cda20ac10354116de7c4744d6154808d0