am e21722a3: Merge "Allow carriers to force disable ETWS/CMAS test messages." into mnc-dev

* commit 'e21722a3daf0562bb7711d3dd38657b5a348ce4e':
  Allow carriers to force disable ETWS/CMAS test messages.