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

Change-Id: I4d9388e39a3dbf34b88eb91f3b1a41dc703d1b83