Merge "update Orange SP apn"
am: e0587f2a3e

Change-Id: I0e26bafb550af07592b7549aed851957dd8132c4