Merge "[automerger skipped] Merge "Get IMS reg and SMS format from IMS Service...
Merge "[automerger skipped] Merge "Get IMS reg and SMS format from IMS Service instead" into rvc-dev am: b1cd429c -s ours am: 0a65cdcc -s ours" into rvc-d1-dev-plus-aosp