Phone: Remove aapt build warnings caused by DE translation

Change-Id: I86aee04a215961780004be3db5024e6ca38b0b71
Expand Network Mode array

needed after CAF merge, otherwise ArrayIndexOutOfBoundsException will occur

https://jira.cyanogenmod.org/browse/CYAN-1749

Change-Id: I80b854d7eed96a4d63f4391feaed25d2ed92554c
Merge "Expand Network Mode array" into cm-10.2
Merge branch 'cm-10.2' into martincz