Merge "Added ETWS primary message default message support"
am: 2d3fb48b39

Change-Id: Ib03378e2f9c2da53b5efbedde08b20acc0b8c199