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