[automerger skipped] Added missed incoming call SMS support am: 9f30a0c6d7 am: b1b9fa592c am: 2c62736f49 -s ours
am skip reason: Change-Id I40b83af690ee72a35a872e08491a948e7aed0ca2 with SHA-1 9f30a0c6d7 is in history

Change-Id: I2f1a81e862f3b3ca912a94561ba59bb732e8df76