[automerger skipped] Merge "Fix permission check for get/setSmscAddress." am:...
[automerger skipped] Merge "Fix permission check for get/setSmscAddress." am: 980e0e12 am: 79f4549b -s ours
am skip reason: Change-Id I60b300d1b2d4e8b67cfc121e10a7957a8f0aaac8 with SHA-1 05e97205 is in history
Change-Id: I9d0d37022cbf654bd2d1377ca3a265cbebf1f77d