[automerger skipped] Merge "Added calling uid check for get/setSmscAddress."...
[automerger skipped] Merge "Added calling uid check for get/setSmscAddress." am: 6ff4ca2c am: d3150a7c -s ours
am skip reason: Change-Id I6cdc5dc599fff4ed9129b444ccb33ac044fed0dc with SHA-1 47b559eb is in history
Change-Id: Id6c98d332ba4fca848c90c1f586d2c62076e3d52