Merge "Remove unused @hide APIs from SmsManager." am: 8b47b32246
am: 4d4d2b36c6

Change-Id: I7217c9502efe5ff398ae4573c65455aa6020909e