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

Change-Id: If7881b8325387d8fbf801b62b8208bb9e80503cd