Merge "Merge "Let application set reply MMS delivery report on or off" am: ab7bf327b7 am: 3a5549a7a4 am: 01a0174fe6" into rvc-d1-dev-plus-aosp am: f732f16f5d

Change-Id: I18d4b65c226aef7cdb55c9b35afdc08f8178b138