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