Merge "Update the OEM unlock preference summary to reflect the disable reason" into nyc-mr1-dev