[automerger skipped] Merge "Fix permission check for get/setSmscAddress." into...

[automerger skipped] Merge "Fix permission check for get/setSmscAddress." into rvc-dev am: fcfd7cf9 am: 508cc87f am: 9e3a12da am: 1a8ebff7 -s ours
am skip reason: Change-Id I60b300d1b2d4e8b67cfc121e10a7957a8f0aaac8 with SHA-1 15a3b86e is in history

Change-Id: Id311739eb78a0221632d998aef8f69815b3fb118