[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: 73794355 -s ours am: 894dde43 -s ours
am skip reason: Change-Id I60b300d1b2d4e8b67cfc121e10a7957a8f0aaac8 with SHA-1 05e97205 is in history

Change-Id: I31810afbd512c9cb25c761cb5e379d66cbef41a7