[automerger skipped] Merge "Get IMS reg and SMS format from IMS Service...
[automerger skipped] Merge "Get IMS reg and SMS format from IMS Service instead" into rvc-dev am: b1cd429c am: 7e045d43 -s ours
am skip reason: Change-Id I3e303290e664ab7ed95634e5ba0854d8fcc4e618 with SHA-1 1a981c3e is in history
Change-Id: Ia93c690f27cae6ac2f7f75588b6c90534df6d337