Merge pull request #13938 from crh0716/941511

Bug 941511 - Add CDMA 1x networks to CDMA types r=alive(cherry picked from commit 911c0c956740d929b37d948442d04ca631c53fa2)

Conflicts:
	apps/system/js/statusbar.js
	apps/system/test/unit/statusbar_test.js