Merge "Updating ISms interface and SmsManager to allow retrieving WAP push message size" into main