Merge \"Added UM.DISALLOW_OEM_UNLOCK, Removed Global.OEM_UNLOCK_DISALLOWED.\" into nyc-mr1-dev
am: 695a1c50a2

Change-Id: I8976511deb994983abbb17b2830b98878c92631b