Merge "Let application set reply MMS delivery report on or off" am: ab7bf327b7 am: 3a5549a7a4 am: 01a0174fe6

Change-Id: Ic550c1bbfbfcdd27953439af4b236c1260fa8819