Merge "Merge "Telephony: Fix the failure of copying SMS to SIM card for sub2" am: 7eca824ce3 am: 1f354082c0" into nyc-mr2-dev-plus-aosp
am: 94d78f5e31

Change-Id: Ic3c4ea573ee8cff925d876e3205e923136a083e2