[automerger skipped] Merge "Add a new internal API to SmsController for...
[automerger skipped] Merge "Add a new internal API to SmsController for sending vvm sms." am: f1ff566f
am: 28b71dd1 -s ours
am skip reason: change_id I649bf795b529c64560e629953e4b82859594f744 with SHA1 26839200 is in history
Change-Id: Ibb5b29f6a82d2832a81163b3c1459b6cc9367a12