Merge "Handle alternative form VVM SMS as legacy notification if the account...
Merge "Handle alternative form VVM SMS as legacy notification if the account is not activated yet." am: 1ffc9adf am: 564f6584
am: bae39829
Change-Id: Ia928545159b72f53719ac85c999d517b7dd5577f