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

Change-Id: Ib90a577fdef5fad79c0bf84b8b50d35f2ff688ed