[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: d2b8ffb7 -s ours am: e74d7e68 -s ours am: 7981da53 -s ours
am skip reason: Change-Id I60b300d1b2d4e8b67cfc121e10a7957a8f0aaac8 with SHA-1 05e97205 is in history

Change-Id: Ifab172e14aa53ca0f7cd190dad5392231d04d604