[automerger skipped] Merge "Revert "Fix permission check for get/setSmscAddress."" am: c070b1de am: ae274c92 -s ours
am skip reason: Change-Id I67a4ffe94e3caabd04a5b9305de3e476867bfbd1 with SHA-1 dec964ce is in history
Change-Id: I90669d3900d4eecd0baaedb60c42e81b45bf560c