Merge "deprecate KEY_CARRIER_FORCE_DISABLE_ETWS_CMAS_TEST_BOOL"
am: 04b9b718a5

Change-Id: I53213519b7702400713c9446e9b36a24f4e1fddf