init: add alpha an numeric back for cri and usc

* DO NOT REVERT
* Fixes roaming indicator off
* I suspect other cdma variants suffer from this too. I'll add back
  on a case-by-case basis.

Change-Id: I974f025dedced7db2b7e532b1eda2e7d5e77d9b0
recovery: remove custom recovery_keys

Change-Id: I116041e627acd6bb4c03f58eefac4902dc3d3f82
Merge branch 'cm-11.0' into kk_mkt