4373 & 4374 part of Severe Alerts

As per specification change 23.041 V9.6.0,
4373 & 4374 have been moved from Extreme
Alerts to Severe Alerts.

Bug: 8847901
Change-Id: I98f443dfc799da259d942f62ce66006058e5ffb1
Merge "4373 & 4374 part of Severe Alerts"
Fix a typo bug.

Card state log should be correctly dispalyed as cdma_id instead of cmda_id.
Merge "Fix a typo bug."
Using a single counter for outstanding requests.

Change-Id: Ie99239fbe02f4ee1528c0dc6e1a1750cad404b2c
Merge "Using a single counter for outstanding requests."
Merge branch 'master' into HEAD

Conflicts:
	src/java/com/android/internal/telephony/RIL.java

Change-Id: I06a9eb69bc78bc648fc0293a18e56e156674afc6