Merge "Add DEVICE_LOCKED to the AndroidKeymasterCommand enum." am: 032480f59d

Original change: https://android-review.googlesource.com/c/platform/system/keymaster/+/1326396

Change-Id: Ie00a55259c4ef5dc58ca4c1e3bc96109f9a770e2