Merge "Fix Etisalat UAE APNs" into cm-11.0
(cherry picked from commit 484b262d111701726669a3d7018c4655f52fc6ec)