[automerger skipped] Fixed encoding of device_locked field am: 76ce61d4ce am: 8d0cddc68b -s ours am: 4d81e5217b -s ours

am skip reason: Change-Id Ibe78d65719f78a4d64581bdef6988f1dfbd85523 with SHA-1 b0cd8a9496 is in history

Change-Id: Ie33dea5fef2d857c255f6887fc3c43e97051f776