Merge "Keep 4G LTE slider disabled after call" into oc-mr1-dev
am: facefe79f4

Change-Id: I0af4888b68db057c70f7752a96ea0a7d811d0f6c