[automerger skipped] Merge "Move SmsApplication to telephony/common." am: f7aec5de09 am: 23c8673670
am: c93fe50d62 -s ours
am skip reason: change_id I8662c210319523abe64feaf0610af19fd285c8ca with SHA1 1ec2e61e7f is in history

Change-Id: Id9818de9e184524ca613d541a81cc70d18d358da