Merge "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" into oc-dev-plus-aosp
am: 06b6687fbd

Change-Id: I04ffb6f1e45a1f1424084e7986426002e16acee2