[automerger skipped] Merge "Merge "Fix permission check for...

[automerger skipped] Merge "Merge "Fix permission check for get/setSmscAddress." into rvc-dev am: fcfd7cf9 am: 18d781b8" into rvc-d1-dev-plus-aosp am: e9e953a3 -s ours
am skip reason: Change-Id I60b300d1b2d4e8b67cfc121e10a7957a8f0aaac8 with SHA-1 05e97205 is in history

Change-Id: Iaea39894c5066a0d7c6354f8c8eb5358b5250b40