Merge "app: aboot: Do not perform erase when the device is locked"