Merge "Telephony: Mock SMS (2/4)" into cm-11.0

Signed-off-by: scott <scott@ubuntu>

Conflicts:
	src/java/com/android/internal/telephony/ImsSMSDispatcher.java

Change-Id: If51ca025f280b14d3d409529c44023c86ac767d7