Merge "Prevent turning on airplane mode when in network identified e-call." am: ce6a2c0dc5 am: cabf3d93d2
am: 40c8904ec7

Change-Id: Ia6cf027a5b02227ec58fefba0c18eb584e811d1b