Merge "Set oem unlock switch to reflect the actual state of device" into nyc-mr1-dev am: 45fd5c4d4e am: a5785b72bb
am: d1a229ab52
Change-Id: I3fb9871a6ede2d592e40ce27136d50be396137c9
This commit is contained in: