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

Change-Id: I59be6b2b8142ecd5de67808a8ed7d7106754b681