Merge "Fix permission check for get/setSmscAddress." am: 980e0e1286

Change-Id: Icf72bce213f4c66cbc09b54c8dc8ea39e9f51f95